Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Granular Import Export UIs #2610

Merged
merged 56 commits into from
Nov 23, 2017

Conversation

jonboiser
Copy link
Contributor

Details

Summary

  • description of the change
  • manual verification steps performed
  • screenshots if the PR affects the UI

Reviewer guidance

description of how to test the changes

References

when applicable, please provide:

  • references to related issues and PRs
  • links to mockups or specs for new features
  • links to the diffs for dependency updates, e.g. in iceqube or the perseus plugin

Contributor Checklist

  • PR has the correct target milestone
  • PR has the appropriate labels
  • Changes in the PR do not introduce accessibility regressions (confimed by testing with one of the recommended tools)
  • If PR is ready for review, it has been assigned or requests review from someone
  • Documentation is updated as necessary
  • External dependency files are updated (yarn and pip)
  • If internal dependency is updated, link to diff is included
  • Screenshots of any front-end changes are in the PR description
  • CHANGELOG.rst is updated for high-level changes
  • You've added yourself to AUTHORS.rst if you're not there

Reviewer Checklist

  • Automated test coverage is satisfactory
  • PR has been fully tested manually

@jonboiser jonboiser added the work-in-progress Not ready for review label Nov 15, 2017
@indirectlylit indirectlylit added this to the 0.7.0 milestone Nov 17, 2017
@codecov
Copy link

codecov bot commented Nov 21, 2017

Codecov Report

Merging #2610 into develop will not change coverage.
The diff coverage is 50%.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #2610   +/-   ##
========================================
  Coverage    77.65%   77.65%           
========================================
  Files          183      183           
  Lines         7034     7034           
  Branches       885      885           
========================================
  Hits          5462     5462           
  Misses        1397     1397           
  Partials       175      175
Impacted Files Coverage Δ
kolibri/content/api.py 73.48% <ø> (ø) ⬆️
frontend_build/src/webpack.config.base.js 70% <ø> (ø) ⬆️
kolibri/tasks/api.py 22.7% <0%> (ø) ⬆️
kolibri/content/serializers.py 91.12% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f99e93a...fb80aff. Read the comment docs.

@jonboiser jonboiser force-pushed the available-channels branch 3 times, most recently from 84f91b7 to d6b4718 Compare November 21, 2017 08:00
Put in channels available message

Loop over channels

Add language filter

Add title filter

Filter both language and title

DRY up spec

Add go to channel callback

Update choose source modal

Add non router-link link to immersive full view

Wrap available channels in immersive full view

Layout for filters

Hide filters if there are no channels

Wrap available channels in subpage-container

Add language to channel metadata

Move channels lists to wizard state

Add ‘All Languages’ option for language filter

Adjust styles

Update wizard-import-source

Add language to channel metadata

Move styles to channel list item

Update availableChannelsPage

Update local export modal

Stub content-node-row component
# Conflicts:
#	kolibri/plugins/management/assets/src/device_management/views/manage-content-page/wizards/wizard-export.vue
#	kolibri/plugins/management/assets/src/device_management/views/manage-content-page/wizards/wizard-import-source.vue
Add remove node action

Fix state

Add count updater

Fix remaining space calculation

Handle easier tree view annotations

Handle stranger cases for selections

Localize messages

Refactor annotateNode

Readjust to new node model

Make selectedNodes getter

Fix updates notifications test
More content node row behavior

Handle more funky tree view cases

Refactor content node spec

Start content-tree-viewer

State of select-all checkbox

Handle select all toggles
Add path to child node annotation

Rename ‘selecttopic’ event

Refactor

Add handlers for toggling children

Remove annotateNodes in favor of annotateNode

Start on showSelectContentPage action

Add ContentNodeGranular Resource

Poll for database import task

Move wizard state

Make correct request to ContentNodeGranular endpoint

Add goToTopic action

Add boilerplate for RemoteChannelResource

Update import export flows
Refactor

Remove deprecated UIs

Add boilerplate for select drive modal

Rename Available channels enum
Fix stale integrations
# Conflicts:
#	kolibri/plugins/management/assets/src/device_management/views/manage-content-page/wizards/import-preview.vue
@indirectlylit indirectlylit added TODO: needs review Waiting for review and removed work-in-progress Not ready for review labels Nov 22, 2017
@indirectlylit indirectlylit self-requested a review November 22, 2017 18:21
@indirectlylit
Copy link
Contributor

addresses #2273

this.crumbs = Array.from(val);
this.attachSensors();
},
},

This comment was marked as spam.

This comment was marked as spam.

*/
export function waitForTaskToComplete(store, taskId) {
return new Promise((resolve, reject) => {
const stopWatching = store.watch(taskList, function checkTaskProgress(tasks) {

This comment was marked as spam.

This comment was marked as spam.

dbPromise = downloadChannelMetadata(store);
}

// Hydrating the store with the Channel Metadata

This comment was marked as spam.

token: '',
tokenIsBlurred: false,
tokenLookupFailed: false,
tokenNetworkError: false,

This comment was marked as spam.

Copy link
Contributor

@indirectlylit indirectlylit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all right let's do it!

<template v-if="canManageContent">
<component v-if="pageState.wizardState.shown" :is="wizardComponent" />
<component
v-if="wizardPageName!==''"

This comment was marked as spam.

@jonboiser
Copy link
Contributor Author

In the export workflow, the logic needs to be slightly different than in the import workflows. So currently, one cannot select leaf nodes or topics that are completely installed for export.

The import workflows should be fine.

@indirectlylit indirectlylit removed the TODO: needs review Waiting for review label Nov 23, 2017
@rtibbles rtibbles added the TAG: user strings Application text that gets translated label Nov 23, 2017
@rtibbles rtibbles merged commit e6bffd9 into learningequality:develop Nov 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
TAG: user strings Application text that gets translated
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants